Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e2e: use controller.GuaranteedUpdate to retry on version conflict (#1522) #1564

Merged
merged 1 commit into from
Jan 15, 2020
Merged

e2e: use controller.GuaranteedUpdate to retry on version conflict (#1522) #1564

merged 1 commit into from
Jan 15, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jan 15, 2020

cherry-pick #1522 to release-1.1

What problem does this PR solve?

https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/operator_ghpr_e2e_test_kind/detail/operator_ghpr_e2e_test_kind/2188/tests

/home/jenkins/agent/workspace/operator_ghpr_e2e_test_kind/go/src/github.com/pingcap/tidb-operator/tests/e2e/tidbcluster/serial.go:133
Jan 9 06:33:17.701: Unexpected error:
<*errors.StatusError | 0xc0005b2320>: {
ErrStatus: {
TypeMeta: {Kind: "", APIVersion: ""},
ListMeta: {
SelfLink: "",
ResourceVersion: "",
Continue: "",
RemainingItemCount: nil,
},
Status: "Failure",
Message: "Operation cannot be fulfilled on tidbclusters.pingcap.com \"deploy\": the object has been modified; please apply your changes to the latest version and try again",
Reason: "Conflict",
Details: {Name: "deploy", Group: "pingcap.com", Kind: "tidbclusters", UID: "", Causes: nil, RetryAfterSeconds: 0},
Code: 409,
},
}
Operation cannot be fulfilled on tidbclusters.pingcap.com "deploy": the object has been modified; please apply your changes to the latest version and try again
occurred
/home/jenkins/agent/workspace/operator_ghpr_e2e_test_kind/go/src/github.com/pingcap/tidb-operator/tests/e2e/tidbcluster/serial.go:233

What is changed and how does it work?

Check List

Tests

  • Unit test
  • E2E test
  • Stability test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has Go code change
  • Has CI related scripts change
  • Has Terraform scripts change

Side effects

  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Does this PR introduce a user-facing change?:

NONE

@cofyc @sre-bot
use controller.GuaranteedUpdate to retry on version conflict
5b7370e 
Signed-off-by: Yecheng Fu <fuyecheng@pingcap.com>
@sre-bot sre-bot mentioned this pull request Jan 15, 2020
Merged
aylei
aylei approved these changes Jan 15, 2020
View reviewed changes
Copy link
Contributor

@aylei aylei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aylei
Copy link
Contributor

aylei commented Jan 15, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jan 15, 2020

Your auto merge job has been accepted, waiting for 1519, 1520

Yisaer
Yisaer approved these changes Jan 15, 2020
View reviewed changes
Copy link
Contributor

@Yisaer Yisaer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sre-bot
Copy link
Contributor Author

sre-bot commented Jan 15, 2020

/run-all-tests

@sre-bot sre-bot merged commit 6cbf92e into pingcap:release-1.1 Jan 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aylei aylei aylei approved these changes

@Yisaer Yisaer Yisaer approved these changes

@DanielZhangQD DanielZhangQD Awaiting requested review from DanielZhangQD

@onlymellb onlymellb Awaiting requested review from onlymellb

@weekface weekface Awaiting requested review from weekface

Assignees
No one assigned
Labels
status/can-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sre-bot @aylei @Yisaer @cofyc